merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 12 Dec 2011 04:04:19 +0000 (13:04 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 12 Dec 2011 04:04:19 +0000 (13:04 +0900)

Trivial merge